//
//  ViewController.m
//  hell
//
//  Created by administrator on 13-8-17.
//  Copyright (c) 2013年 administrator. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad
{
    [super viewDidLoad];
	// Do any additional setup after loading the view, typically from a nib.
}

- (void)didReceiveMemoryWarning
{
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}

<<<<<<< HEAD
- (IBAction)bt1:(id)sender {
    
    
    self.lb1.text = @"asdfghjklrthjkl";
=======
- (IBAction)tt:(id)sender
{
    self.lb.text = @"asfsdfdsfds";
>>>>>>> daa48889e61cfca6820c05f5ec102ef505e68b97
}
@end
